From: Florian Müllner <fmuellner@gnome.org>
Date: Sun, 12 Apr 2020 15:15:48 +0000 (+0200)
Subject: appDisplay: Look up directory- instead of category translations
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~684^2^2~494
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=3fac0632a8fdb78a7082dd403cbf27dd62ed91b7;p=gnome-shell.git

appDisplay: Look up directory- instead of category translations

Translations are provided by .directory files, so trying to look
up a category name without the suffix will always fail.

Commit 343b3351f1 tried to fix this previously by changing the
saved keys, but that broke existing translatable folders.

Appending the .directory suffix for the lookup instead fixes the
issue without regressing non-custom folders.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2623
---

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 99c052b79..08febc491 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -115,7 +115,8 @@ function _findBestFolderName(apps) {
     }, commonCategories);
 
     for (let category of commonCategories) {
-        let translated = Shell.util_get_translated_folder_name(category);
+        const directory = '%s.directory'.format(category);
+        const translated = Shell.util_get_translated_folder_name(directory);
         if (translated !== null)
             return translated;
     }